From 7d4512beab3df9bb3a1fc18a0690a2623f4390c9 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 13 Nov 2018 18:21:43 -0600 Subject: [PATCH] Fix pyramid/pgwui testing usage --- setup.py | 1 + tests/test___init__.py | 18 ++---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/setup.py b/setup.py index 9141c01..7c87d9d 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ long_description = filter_readme() # Pyramid testing requirements tests_require = [ + 'pgwui_testing==' + version, 'WebTest >= 1.3.1', # py3 compat 'pytest>=3.7.4', 'pytest-cov', diff --git a/tests/test___init__.py b/tests/test___init__.py index aa06b99..2dd7cec 100644 --- a/tests/test___init__.py +++ b/tests/test___init__.py @@ -20,25 +20,11 @@ # Karl O. Pinc import pyramid.config -import pyramid.testing import pyramid.threadlocal -import pytest import pgwui_common.__init__ as pgwui_common_init - -# Fixtures - -@pytest.fixture -def pyramid_config(): - yield pyramid.testing.setUp() - pyramid.testing.tearDown() - - -@pytest.fixture -def pyramid_request_config(): - request = pyramid.testing.DummyRequest() - yield pyramid.testing.setUp(request=request) - pyramid.testing.tearDown() +# Activiate our pytest plugin +pytest_plugins = ("pgwui",) # Unit tests -- 2.34.1